ChangeLog fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5aec2a8f7ee34b88958d18d3eccd66eb63b2bb41..2fbe063cecaadf130357352dcf79dc246c2ab103 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -997,7 +997,6 @@
        * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
        `memq' (Bug#8799).
 
->>>>>>> MERGE-SOURCE
 2011-06-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (make-progress-reporter): Add "..." by default (bug#8785).